Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:10:44 +0000 (09:10 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:10:44 +0000 (09:10 -0700)

Trivial merge